auto merge of #416 : alexcrichton/cargo/dox, r=wycats
authorbors <bors@rust-lang.org>
Thu, 28 Aug 2014 19:32:37 +0000 (19:32 +0000)
committerbors <bors@rust-lang.org>
Thu, 28 Aug 2014 19:32:37 +0000 (19:32 +0000)
Closes #414

1  2 
.travis.yml
src/doc/source/guide.md

diff --cc .travis.yml
Simple merge
Simple merge